projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc943b1 34b1108)
bitkeeper revision 1.1236.40.1 (42403ff1ZGMKPWPwodeJzyyFrCMVvg)
authorjrb44@swoop.cl.cam.ac.uk <jrb44@swoop.cl.cam.ac.uk>
Tue, 22 Mar 2005 15:55:29 +0000 (15:55 +0000)
committerjrb44@swoop.cl.cam.ac.uk <jrb44@swoop.cl.cam.ac.uk>
Tue, 22 Mar 2005 15:55:29 +0000 (15:55 +0000)
manual merge phase 1 of 2 :-(

1  2 
tools/blktap/blockstore.h patch | diff1 | diff2 | blob | history

diff --cc tools/blktap/blockstore.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.